(ediff-update-diffs): Change error message.

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index fbd5808726a43bbc6a857c93b53e02a9515131fb..a87e45496484ac6e1eb5e1765ac432510bf95653 100644 (file)
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -549,7 +549,7 @@ if necessary."
   (ediff-barf-if-not-control-buffer)
   (if (and (ediff-buffer-live-p ediff-ancestor-buffer)
           (not (y-or-n-p "Recompute differences during merge, really? ")))
-      (error "God forbid!"))
+      (error "Recomputation of differences cancelled"))
       
   (let ((point-A (ediff-eval-in-buffer ediff-buffer-A (point)))
        ;;(point-B (ediff-eval-in-buffer ediff-buffer-B (point)))